Merge from emacs-24 branch; up to r108077
authorChong Yidong <cyd@gnu.org>
Sat, 21 Jul 2012 06:14:00 +0000 (14:14 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 21 Jul 2012 06:14:00 +0000 (14:14 +0800)

Trivial merge